(x_set_font): Clear f->n_tool_bar_rows and current frame

matrices to force recalculation of tool-bar height after font change.

diff --git a/src/frame.c b/src/frame.c
index dd91e4366002a75471a679dd16c17e02d9a044c1..c08d5a6f84d327bfcdc5fb5278c6a024100b6ea7 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -3095,6 +3095,11 @@ x_set_font (f, arg, oldval)
       else if (!NILP (Fequal (result, oldval)))
         return;
 
+      /* Recalculate toolbar height.  */
+      f->n_tool_bar_rows = 0;
+      /* Ensure we redraw it.  */
+      clear_current_matrices (f);
+
       store_frame_param (f, Qfont, result);
       recompute_basic_faces (f);
     }